fix(flext): stabilize from clean 0.12.0-dev with conflict marker CI check - #177
Merged
Conversation
…heck **Análise:** - Repo estava em detached HEAD (.git/HEAD apontava para branch inexistente 'wip/session-suspend-20260824/aihub-audit') - Nenhum broken merge ou conflict marker no 0.12.0-dev (origin) - 31 submodules, 4 CI workflows existentes - CI: 5 workflows (4 existentes + 1 nova: conflict-marker-check)
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+8
to
+20
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Check for merge conflict markers | ||
| run: | | ||
| markers=$(git grep -l '<<<<<<< HEAD\|=======$' -- \ | ||
| $(git ls-files | grep -vE '\.venv/|node_modules/|dist/|build/|\.cache/|_vendor/' | tr '\n' ' ') 2>/dev/null || true) | ||
| if [ -n "$markers" ]; then | ||
| echo "::error::Merge conflict markers found in tracked files:" | ||
| echo "$markers" | ||
| exit 1 | ||
| fi | ||
| echo "No conflict markers found." |
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stabiliza flext a partir de 0.12.0-dev clean.
Análise da situação:
Summary by cubic
Adds a CI workflow that fails pull requests when tracked files contain merge conflict markers, excluding common dependency and build directories. This prevents broken merges from being accidentally introduced.
Written for commit 36679c2. Summary will update on new commits.